mir: Fix build failure due to changed API
authorWilliam Hua <william.hua@canonical.com>
Tue, 7 Apr 2015 14:33:35 +0000 (10:33 -0400)
committerWilliam Hua <william.hua@canonical.com>
Tue, 7 Apr 2015 14:38:22 +0000 (10:38 -0400)
mir_surface_set_event_handler() now takes three arguments.

gdk/mir/gdkmirwindowimpl.c

index 666a1d06cf332ca4cff23ab8a3fb72d22c593b77..b4767cbca2c67d2a231f49c774ece5586ac782e9 100644 (file)
@@ -213,7 +213,6 @@ ensure_surface_full (GdkWindow *window,
                      MirBufferUsage buffer_usage)
 {
   GdkMirWindowImpl *impl = GDK_MIR_WINDOW_IMPL (window->impl);
-  MirEventDelegate event_delegate = { event_cb, NULL };
   GdkMirWindowReference *window_ref;
 
   if (impl->surface || should_render_in_parent (window))
@@ -224,8 +223,6 @@ ensure_surface_full (GdkWindow *window,
    */
   window_ref = _gdk_mir_event_source_get_window_reference (window);
 
-  event_delegate.context = window_ref;
-
   impl->surface = create_mir_surface (gdk_window_get_display (window),
                                       window->width, window->height,
                                       buffer_usage);
@@ -240,7 +237,7 @@ ensure_surface_full (GdkWindow *window,
 
   _gdk_mir_event_source_queue (window_ref, &resize_event);
 
-  mir_surface_set_event_handler (impl->surface, &event_delegate); // FIXME: Ignore some events until shown
+  mir_surface_set_event_handler (impl->surface, event_cb, window_ref); // FIXME: Ignore some events until shown
   set_surface_type (impl, impl->surface_type);
   set_surface_state (impl, impl->surface_state);
 }